Fix fallout from g_object_ref change

g_object_ref now returns the type of the object that was
passed. Introduce cast as necessary to avoid warnings due
to this.

diff --git a/gtk/a11y/gtklabelaccessible.c b/gtk/a11y/gtklabelaccessible.c
index 0cdb6e0c582a71babaa11ecc65656f5a7ee3b9e6..91b1ac861dd341164a61650d6f5478fe93af7717 100644 (file)
--- a/gtk/a11y/gtklabelaccessible.c
+++ b/gtk/a11y/gtklabelaccessible.c
@@ -84,7 +84,7 @@ gtk_label_accessible_link_impl_get_hyperlink (AtkHyperlinkImpl *atk_impl)
 {
   GtkLabelAccessibleLinkImpl *impl = (GtkLabelAccessibleLinkImpl *)atk_impl;
 
-  return g_object_ref (impl->link);
+  return (AtkHyperlink *)g_object_ref (impl->link);
 }
 
 static void

diff --git a/gtk/a11y/gtktreeviewaccessible.c b/gtk/a11y/gtktreeviewaccessible.c
index 3a184e749d60cbe97dd2f22be11628b91b5f4d4e..05629a06e3aae46b8a387a8006dffac6c016cecd 100644 (file)
--- a/gtk/a11y/gtktreeviewaccessible.c
+++ b/gtk/a11y/gtktreeviewaccessible.c
@@ -469,7 +469,7 @@ gtk_tree_view_accessible_ref_child (AtkObject *obj,
   if (cell == NULL)
     cell = create_cell (tree_view, accessible, tree, node, tv_col);
 
-  return g_object_ref (cell);
+  return (AtkObject *) g_object_ref (cell);
 }
 
 static AtkStateSet*
@@ -562,7 +562,7 @@ gtk_tree_view_accessible_ref_accessible_at_point (AtkComponent *component,
   if (cell == NULL)
     cell = create_cell (tree_view, GTK_TREE_VIEW_ACCESSIBLE (component), tree, node, column);
 
-  return g_object_ref (cell);
+  return (AtkObject *) g_object_ref (cell);
 }
 
 static void

diff --git a/gtk/gtkcellrendererspin.c b/gtk/gtkcellrendererspin.c
index 5fa0cae35b5e21e75324c3b63bae785c104bdaf6..6f67a8b5fc7b9b8c416571271dc41d8855374ff9 100644 (file)
--- a/gtk/gtkcellrendererspin.c
+++ b/gtk/gtkcellrendererspin.c
@@ -227,7 +227,8 @@ gtk_cell_renderer_spin_set_property (GObject      *object,
        }
 
       if (obj)
-       priv->adjustment = g_object_ref_sink (obj);
+       priv->adjustment = GTK_ADJUSTMENT (g_object_ref_sink (obj));
+
       break;
     case PROP_CLIMB_RATE:
       priv->climb_rate = g_value_get_double (value);

diff --git a/gtk/gtkcolorplane.c b/gtk/gtkcolorplane.c
index af0cede14063096611e354911e9092d4aca3fea9..221664c3bee7fd5c1f2d43ecdbd1611d564a5a51 100644 (file)
--- a/gtk/gtkcolorplane.c
+++ b/gtk/gtkcolorplane.c
@@ -459,7 +459,7 @@ plane_set_property (GObject      *object,
                    GParamSpec   *pspec)
 {
   GtkColorPlane *plane = GTK_COLOR_PLANE (object);
-  GObject *adjustment;
+  GtkAdjustment *adjustment;
 
   /* Construct only properties can only be set once, these are created
    * only in order to be properly buildable from gtkcoloreditor.ui

diff --git a/gtk/gtkcomboboxtext.c b/gtk/gtkcomboboxtext.c
index 4b15c04028431efedd93eaa9edeeb0cb94d061f3..f03ebbabc766ad401a2507e4bec7efe85d1f8861 100644 (file)
--- a/gtk/gtkcomboboxtext.c
+++ b/gtk/gtkcomboboxtext.c
@@ -292,7 +292,7 @@ gtk_combo_box_text_buildable_custom_tag_start (GtkBuildable  *buildable,
 
       data = g_slice_new0 (ItemParserData);
       data->builder = g_object_ref (builder);
-      data->object = g_object_ref (buildable);
+      data->object = (GObject *) g_object_ref (buildable);
       data->domain = gtk_builder_get_translation_domain (builder);
       data->string = g_string_new ("");
 

diff --git a/gtk/gtkcssimagefallback.c b/gtk/gtkcssimagefallback.c
index afc5aef779c0ac764f6ba40caab06ad37df313fd..7bd310c855887007159b62d7834930bd2a343926 100644 (file)
--- a/gtk/gtkcssimagefallback.c
+++ b/gtk/gtkcssimagefallback.c
@@ -176,7 +176,7 @@ gtk_css_image_fallback_compute (GtkCssImage      *image,
       return GTK_CSS_IMAGE (copy);
     }
   else
-    return g_object_ref (fallback);
+    return GTK_CSS_IMAGE (g_object_ref (fallback));
 }
 
 static gboolean

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index ca5576c106407dc1fff17598dc924076b9d37c33..f66cefe5109b50c582280cf4c97444de5d265cd8 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1623,7 +1623,7 @@ gtk_label_buildable_custom_tag_start (GtkBuildable     *buildable,
 
       parser_data = g_slice_new0 (PangoParserData);
       parser_data->builder = g_object_ref (builder);
-      parser_data->object = g_object_ref (buildable);
+      parser_data->object = (GObject *) g_object_ref (buildable);
       *parser = pango_parser;
       *data = parser_data;
       return TRUE;

diff --git a/gtk/gtksidebarrow.c b/gtk/gtksidebarrow.c
index d3a58bd30d0c3851330c6d396b7db6c81c784ffc..c03fe57f7b9de534e0b552c8285f2b51f98d522f 100644 (file)
--- a/gtk/gtksidebarrow.c
+++ b/gtk/gtksidebarrow.c
@@ -225,7 +225,7 @@ gtk_sidebar_row_set_property (GObject      *object,
         object = g_value_get_object (value);
         if (object != NULL)
           {
-            self->start_icon = g_object_ref (object);
+            self->start_icon = G_ICON (g_object_ref (object));
             gtk_image_set_from_gicon (GTK_IMAGE (self->start_icon_widget), self->start_icon);
           }
         else
@@ -241,7 +241,7 @@ gtk_sidebar_row_set_property (GObject      *object,
         object = g_value_get_object (value);
         if (object != NULL)
           {
-            self->end_icon = g_object_ref (object);
+            self->end_icon = G_ICON (g_object_ref (object));
             gtk_image_set_from_gicon (GTK_IMAGE (self->end_icon_widget), self->end_icon);
             gtk_widget_show (self->end_icon_widget);
           }

diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c
index 65e97d9d41701072193552038903a9100c6fd545..1d4a4b97711c8c4a911baac42c5f7285fa5374bb 100644 (file)
--- a/gtk/gtktoolpalette.c
+++ b/gtk/gtktoolpalette.c
@@ -693,7 +693,7 @@ gtk_tool_palette_add (GtkContainer *container,
 
   g_ptr_array_add (palette->priv->groups, info);
   info->pos = palette->priv->groups->len - 1;
-  info->widget = g_object_ref_sink (child);
+  info->widget = (GtkToolItemGroup *)g_object_ref_sink (child);
 
   gtk_widget_set_parent (child, GTK_WIDGET (palette));
 }

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index fcc849bc2cacab729eb2614ceb6e6d8b8184be1b..5146b0fc666a505c02ab0372458da5d92ced4722 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -14233,7 +14233,7 @@ gtk_tree_view_set_search_entry (GtkTreeView *tree_view,
 
   if (entry)
     {
-      tree_view->priv->search_entry = g_object_ref (entry);
+      tree_view->priv->search_entry = GTK_WIDGET (g_object_ref (entry));
       tree_view->priv->search_custom_entry_set = TRUE;
 
       if (tree_view->priv->search_entry_changed_id == 0)

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 83d38efb8a8a8e7dc0d9efc1bff2dc192ceebe11..e88df80164dbf50c6ff12c813dd8ccaa10379ba0 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -11924,7 +11924,7 @@ gtk_widget_buildable_custom_tag_start (GtkBuildable     *buildable,
       AccelGroupParserData *data;
 
       data = g_slice_new0 (AccelGroupParserData);
-      data->object = g_object_ref (buildable);
+      data->object = (GObject *)g_object_ref (buildable);
       data->builder = builder;
 
       *parser = accel_group_parser;

diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
index abc5f841c62d1d98036bf0bf129fb6586a8600f1..3751b2d8c03383ba2e8b8aae0a32d87511135634 100644 (file)
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -3959,7 +3959,7 @@ cups_request_ppd (GtkPrinter *printer)
   g_io_channel_set_encoding (data->ppd_io, NULL, NULL);
   g_io_channel_set_close_on_unref (data->ppd_io, TRUE);
 
-  data->printer = g_object_ref (printer);
+  data->printer = (GtkPrinterCups *) g_object_ref (printer);
 
   resource = g_strdup_printf ("/printers/%s.ppd",
                               gtk_printer_cups_get_ppd_name (GTK_PRINTER_CUPS (printer)));

diff --git a/tests/testentrycompletion.c b/tests/testentrycompletion.c
index 332d6bef5f04881428250892f0fa1730d27418a2..ec1d2f6d685ab2a7cbcc27b0b650aa4884f19d83 100644 (file)
--- a/tests/testentrycompletion.c
+++ b/tests/testentrycompletion.c
@@ -233,7 +233,7 @@ animation_timer (GtkEntryCompletion *completion)
        {
          g_print ("removing model!\n");
 
-         old_store = g_object_ref (gtk_entry_completion_get_model (completion));
+         old_store = GTK_LIST_STORE (g_object_ref (gtk_entry_completion_get_model (completion)));
          gtk_entry_completion_set_model (completion, NULL);
        }
       else